From 21ac2330af1062215c0f549998f67a774510740f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Timm=20B=C3=A4der?= Date: Sun, 12 Apr 2020 09:46:03 +0200 Subject: [PATCH] stylecontext: Remove get_pango_attributes Make the only caller use GtkCssNode API. --- gtk/gtkstylecontext.c | 6 ------ gtk/gtkstylecontextprivate.h | 2 -- gtk/gtktext.c | 5 +---- 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/gtk/gtkstylecontext.c b/gtk/gtkstylecontext.c index 15e0085537..6474761939 100644 --- a/gtk/gtkstylecontext.c +++ b/gtk/gtkstylecontext.c @@ -1408,12 +1408,6 @@ gtk_snapshot_render_insertion_cursor (GtkSnapshot *snapshot, } } -PangoAttrList * -_gtk_style_context_get_pango_attributes (GtkStyleContext *context) -{ - return gtk_css_style_get_pango_attributes (gtk_style_context_lookup_style (context)); -} - static AtkAttributeSet * add_attribute (AtkAttributeSet *attributes, AtkTextAttribute attr, diff --git a/gtk/gtkstylecontextprivate.h b/gtk/gtkstylecontextprivate.h index f01adc5edb..b0e675d807 100644 --- a/gtk/gtkstylecontextprivate.h +++ b/gtk/gtkstylecontextprivate.h @@ -53,8 +53,6 @@ void _gtk_style_context_get_cursor_color (GtkStyleContext GdkRGBA *primary_color, GdkRGBA *secondary_color); -PangoAttrList *_gtk_style_context_get_pango_attributes (GtkStyleContext *context); - /* Accessibility support */ AtkAttributeSet *_gtk_style_context_get_attributes (AtkAttributeSet *attributes, GtkStyleContext *context); diff --git a/gtk/gtktext.c b/gtk/gtktext.c index 311a3e7246..c5049614ac 100644 --- a/gtk/gtktext.c +++ b/gtk/gtktext.c @@ -4334,7 +4334,6 @@ gtk_text_create_layout (GtkText *self, { GtkTextPrivate *priv = gtk_text_get_instance_private (self); GtkWidget *widget = GTK_WIDGET (self); - GtkStyleContext *context; PangoLayout *layout; PangoAttrList *tmp_attrs; char *preedit_string = NULL; @@ -4343,12 +4342,10 @@ gtk_text_create_layout (GtkText *self, char *display_text; guint n_bytes; - context = gtk_widget_get_style_context (widget); - layout = gtk_widget_create_pango_layout (widget, NULL); pango_layout_set_single_paragraph_mode (layout, TRUE); - tmp_attrs = _gtk_style_context_get_pango_attributes (context); + tmp_attrs = gtk_css_style_get_pango_attributes (gtk_css_node_get_style (gtk_widget_get_css_node (widget))); tmp_attrs = _gtk_pango_attr_list_merge (tmp_attrs, priv->attrs); if (!tmp_attrs) tmp_attrs = pango_attr_list_new (); -- 2.30.2